Skip to content

Conversation

@jordan-powers
Copy link
Contributor

Backport

This will backport the following commits from main to 8.19:

Questions ?

Please refer to the Backport tool documentation

This PR is a precursor to elastic#126492.

It does three things:
- Move org.elasticsearch.common.text.Text from :server to
  org.elasticsearch.xcontent.Text in :libs:x-content.
- Refactor the Text class to use a java-native ByteBuffer instead
  of the elasticsearch BytesReference.
- Add the XContentString interface, with the Text class implementing
  that interface.

(cherry picked from commit db0c3c7)

# Conflicts:
#	server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/DefaultHighlighter.java
#	server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java
#	server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java
#	test/framework/src/main/java/org/elasticsearch/search/SearchResponseUtils.java
@jordan-powers jordan-powers added :Core/Infra/Core Core issues without another label auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) labels May 8, 2025
@elasticsearchmachine elasticsearchmachine merged commit c77870e into elastic:8.19 May 8, 2025
15 checks passed
@jordan-powers jordan-powers deleted the backport/8.19/pr-127666 branch May 8, 2025 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport :Core/Infra/Core Core issues without another label v8.19.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants